Extract account logic from BaseActivity into a mixin by ezaquarii · Pull Request #5064 · nextcloud/android

ezaquarii · 2019-12-25T16:13:26Z

This PR moves some account-related shared logic in BaseActivity into a mix-in.

My intention is to collect various account handling logic there, although it is still in a research phase.

@tobiasKaminsky @AndyScherzinger I tried to bring a test coverage to some acceptable level, but this code is so untestable that the task proven to be counter-productive. This code generally must go anyway.

The session mixin has the original, account-related code moved verbatim, without functional changes, so the mixin should behave indentically to the original and
#5031 (comment) is also accounted for.

codecov · 2020-01-14T05:45:36Z

Codecov Report

Merging #5064 into master will increase coverage by 2.24%.
The diff coverage is 61.62%.

@@             Coverage Diff              @@
##             master    #5064      +/-   ##
============================================
+ Coverage     17.71%   19.96%   +2.24%     
  Complexity        3        3              
============================================
  Files           392      397       +5     
  Lines         33147    33232      +85     
  Branches       4656     4662       +6     
============================================
+ Hits           5873     6635     +762     
+ Misses        26324    25516     -808     
- Partials        950     1081     +131

Impacted Files	Coverage Δ	Complexity Δ
.../nextcloud/client/onboarding/FirstRunActivity.java	`37.36% <ø> (-0.69%)`	`0 <0> (ø)`
...ud/android/ui/activity/ManageAccountsActivity.java	`0.52% <ø> (ø)`	`0 <0> (ø)`	⬇️
...java/com/nextcloud/client/di/ActivityInjector.java	`92.3% <ø> (ø)`	`0 <0> (ø)`	⬇️
...cloud/android/ui/activity/FileDisplayActivity.java	`24% <ø> (+3.87%)`	`0 <0> (ø)`	⬇️
...main/java/com/nextcloud/client/core/AsyncRunner.kt	`0% <ø> (ø)`	`0 <0> (ø)`	⬇️
...m/nextcloud/client/account/UserAccountManager.java	`0% <ø> (-33.34%)`	`0 <0> (ø)`
...m/owncloud/android/ui/activity/DrawerActivity.java	`45.61% <0%> (+0.59%)`	`0 <0> (ø)`	⬇️
...wncloud/android/ui/adapter/AccountListAdapter.java	`12.38% <0%> (ø)`	`0 <0> (ø)`	⬇️
...xtcloud/client/account/UserAccountManagerImpl.java	`62.41% <0%> (-0.9%)`	`0 <0> (ø)`
...n/java/com/nextcloud/client/mixins/SessionMixin.kt	`54.28% <54.28%> (ø)`	`0 <0> (?)`
... and 58 more

AndyScherzinger · 2020-02-04T07:35:15Z

@ezaquarii looks good to me code-wise. 👍
Only thing missing are the license headers in the newly created files.

ezaquarii · 2020-02-04T09:11:41Z

Oupsie! This is my private debug code - it should not be there. I'll fix it.

…

On February 4, 2020 8:11:07 AM UTC, Tobias Kaminsky ***@***.***> wrote: tobiasKaminsky commented on this pull request. > @@ -32,6 +33,7 @@ @OverRide public final void onActivityCreated(Activity activity, Bundle savedInstanceState) { + Log.d("mytag", String.format("ActivityInjector.onActivityCreated(): %s", activity)); Why do we use Log instead of Log_OC here? "mytag" is also too generic. You could generate a tag from the activity? Or call it "ActivityInjector" > @@ -1359,12 +1358,13 @@ private View findQuotaViewById(int id) { */ protected abstract void restart(); - @OverRide - protected void onAccountCreationSuccessful(AccountManagerFuture<Bundle> future) { - super.onAccountCreationSuccessful(future); - updateAccountList(); - restart(); - } +// @OverRide Can you remove this? > @OverRide protected void onCreate(Bundle savedInstanceState) { Log_OC.v(TAG, "onCreate() start"); - + Log.d("mytag", "FileDisplayActivity.onCreate(): before super"); Same questions regarding log :-) -- You are receiving this because you were mentioned. Reply to this email directly or view it on GitHub: #5064 (review)

tobiasKaminsky · 2020-02-05T10:27:52Z

Did a smoke test and it works 👍

Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>

nextcloud-android-bot · 2020-02-05T22:12:32Z

Here is an overview of what got changed by this pull request:

Complexity decreasing per file
==============================
+ src/main/java/com/owncloud/android/ui/activity/BaseActivity.java  -5

See the complete overview on Codacy

nextcloud-android-bot · 2020-02-06T06:41:47Z

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/12569.apk

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.

nextcloud-android-bot · 2020-02-06T06:41:47Z

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/12570.apk

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.

nextcloud-android-bot · 2020-02-06T06:51:02Z

Codacy

337

Lint

Type	master	PR
Warnings	76	76
Errors	0	0

SpotBugs (new)

Warning Type	Number
Bad practice Warnings	26
Correctness Warnings	71
Internationalization Warnings	13
Malicious code vulnerability Warnings	5
Multithreaded correctness Warnings	9
Performance Warnings	79
Security Warnings	45
Dodgy code Warnings	138
Total	386

SpotBugs (master)

Warning Type	Number
Bad practice Warnings	26
Correctness Warnings	71
Internationalization Warnings	13
Malicious code vulnerability Warnings	5
Multithreaded correctness Warnings	9
Performance Warnings	79
Security Warnings	45
Dodgy code Warnings	138
Total	386

92ddf10 Merge remote-tracking branch 'origin/master' into dev 5905b1c Merge pull request #5432 from nextcloud/ezaquarii/migrate-drawer-menu-utils-to-new-user-model 4be18ad Merge pull request #5064 from nextcloud/ezaquarii/extract-account-logic-from-base-activity-into-mixin 619b5d0 Merge pull request #5419 from nextcloud/dependabot/gradle/org.projectlombok-lombok-1.18.12 2d6e73d Merge pull request #5414 from nextcloud/fixContactCrash 1bb04aa also increase annotationProcessor 6048243 Fix crash: Caused by: java.lang.ClassCastException: java.lang.Object[] cannot be cast to java.lang.Void[] 0027df9 [tx-robot] updated from transifex 6dd5d92 Merge pull request #5443 from nextcloud/fixTransifex b4db9d0 do not break line on transifex b5fb9c1 Migrate drawer menu utilities to new user model a906a14 daily dev 20200208

ezaquarii requested review from AndyScherzinger and tobiasKaminsky December 25, 2019 16:13

ezaquarii added the 2. developing label Dec 25, 2019

ezaquarii force-pushed the ezaquarii/extract-account-logic-from-base-activity-into-mixin branch from 62185ae to 3148156 Compare January 14, 2020 05:45

ezaquarii force-pushed the ezaquarii/extract-account-logic-from-base-activity-into-mixin branch from 3148156 to 75c6622 Compare January 14, 2020 05:52

ezaquarii requested a review from nextcloud-android-bot January 14, 2020 05:54

ezaquarii force-pushed the ezaquarii/extract-account-logic-from-base-activity-into-mixin branch 4 times, most recently from 5472a0a to 0a56b09 Compare January 29, 2020 06:05

ezaquarii force-pushed the ezaquarii/extract-account-logic-from-base-activity-into-mixin branch from 0a56b09 to 3d84267 Compare February 3, 2020 20:47

ezaquarii added 3. to review and removed 2. developing labels Feb 3, 2020

ezaquarii force-pushed the ezaquarii/extract-account-logic-from-base-activity-into-mixin branch 2 times, most recently from 692ad68 to 51f893f Compare February 3, 2020 22:54

tobiasKaminsky reviewed Feb 4, 2020

View reviewed changes

Comment thread src/main/java/com/nextcloud/client/di/ActivityInjector.java Outdated

Comment thread src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java Outdated

Comment thread src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java Outdated

ezaquarii force-pushed the ezaquarii/extract-account-logic-from-base-activity-into-mixin branch 3 times, most recently from 6b2f879 to 7b64b1d Compare February 5, 2020 00:14

tobiasKaminsky requested changes Feb 5, 2020

View reviewed changes

Comment thread src/main/java/com/nextcloud/client/mixins/SessionMixin.kt

Comment thread src/test/java/com/nextcloud/client/mixins/MixinRegistryTest.kt

Comment thread src/test/java/com/nextcloud/client/mixins/SessionMixinTest.kt

Extract account logic from BaseActivity into a mixin

26f2d52

Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>

ezaquarii force-pushed the ezaquarii/extract-account-logic-from-base-activity-into-mixin branch from 7b64b1d to 26f2d52 Compare February 5, 2020 22:09

ezaquarii requested a review from tobiasKaminsky February 5, 2020 22:09

AndyScherzinger approved these changes Feb 6, 2020

View reviewed changes

tobiasKaminsky approved these changes Feb 10, 2020

View reviewed changes

tobiasKaminsky merged commit 4be18ad into master Feb 10, 2020

delete-merged-branch Bot deleted the ezaquarii/extract-account-logic-from-base-activity-into-mixin branch February 10, 2020 11:33

AndyScherzinger added this to the Nextcloud App 3.11.0 milestone Feb 10, 2020

ezaquarii mentioned this pull request Mar 2, 2020

Migrations manager #5546

Merged

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Extract account logic from BaseActivity into a mixin#5064

Extract account logic from BaseActivity into a mixin#5064
tobiasKaminsky merged 1 commit into
masterfrom
ezaquarii/extract-account-logic-from-base-activity-into-mixin

ezaquarii commented Dec 25, 2019 •

edited

Loading

Uh oh!

codecov Bot commented Jan 14, 2020 •

edited

Loading

Uh oh!

AndyScherzinger commented Feb 4, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ezaquarii commented Feb 4, 2020 via email

Uh oh!

tobiasKaminsky commented Feb 5, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nextcloud-android-bot commented Feb 5, 2020

Uh oh!

nextcloud-android-bot commented Feb 6, 2020

Uh oh!

nextcloud-android-bot commented Feb 6, 2020

Uh oh!

nextcloud-android-bot commented Feb 6, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Uh oh!

Conversation

ezaquarii commented Dec 25, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov Bot commented Jan 14, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

AndyScherzinger commented Feb 4, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ezaquarii commented Feb 4, 2020 via email

Uh oh!

tobiasKaminsky commented Feb 5, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nextcloud-android-bot commented Feb 5, 2020

Uh oh!

nextcloud-android-bot commented Feb 6, 2020

Uh oh!

nextcloud-android-bot commented Feb 6, 2020

Uh oh!

nextcloud-android-bot commented Feb 6, 2020

Codacy

Lint

SpotBugs (new)

SpotBugs (master)

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

ezaquarii commented Dec 25, 2019 •

edited

Loading

codecov Bot commented Jan 14, 2020 •

edited

Loading